|
|
@@ -737,10 +737,7 @@ class ActivityInfo(BaseModelMixin):
|
737
|
737
|
final_expire_at = self.final_expire_at(created_at=created_at)
|
738
|
738
|
if not final_expire_at:
|
739
|
739
|
return ''
|
740
|
|
- y = tc.local_string(utc_dt=final_expire_at, format='%Y')
|
741
|
|
- m = tc.local_string(utc_dt=final_expire_at, format='%m')
|
742
|
|
- d = tc.local_string(utc_dt=final_expire_at, format='%d')
|
743
|
|
- return u'{}年{}月{}日'.format(y, m, d)
|
|
740
|
+ return tc.local_string(utc_dt=final_expire_at, format=u'%Y年%m月%d日', isuc=True)
|
744
|
741
|
|
745
|
742
|
def has_unexpired_activity(self, model_name):
|
746
|
743
|
return ((self.model_uni_names and model_name in self.model_uni_names) or not self.model_uni_names) and (self.start_at <= tc.utc_datetime() < self.end_at)
|